auto merge of #1003 : jmesmon/cargo/update-for-nightly, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 3 Dec 2014 07:59:15 +0000 (07:59 +0000)
committerbors <bors@rust-lang.org>
Wed, 3 Dec 2014 07:59:15 +0000 (07:59 +0000)
I'm a bit shaky on the profile.rs changes (`thread_local!` and `RefCell` relplacing `local_data_key!`), do make sure I haven't royally screwed something up there.


Trivial merge